Commit last commit harder.

diff --git a/Makefile.in b/Makefile.in
index 4c459e3c150a4599db2377df440ee51cffa08731..96611fe39e1f2a7fc129ed5afccbc6cd9cc69e30 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -471,9 +471,6 @@ csv_util.o: csv_util.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
   jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \
   jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h \
   grtcirc.h src/core/logging.h strptime.h xcsv_tokens.gperf
-delbin.o: delbin.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
-  gbfile.h cet.h inifile.h session.h src/core/datetime.h \
-  src/core/xmltag.h
 delgpl.o: delgpl.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
   gbfile.h cet.h inifile.h session.h src/core/datetime.h
 destinator.o: destinator.cc defs.h config.h queue.h zlib/zlib.h \

diff --git a/testo.d/an1.test b/testo.d/an1.test
index 5e82bd7e6ea6dee62def47981dbd083e0ce2b8fb..56a2e167a5c94af679ef8ba805c0813b7b7e92dc 100644 (file)
--- a/testo.d/an1.test
+++ b/testo.d/an1.test
@@ -14,7 +14,7 @@ rm -f ${TMPDIR}/an1.out
 gpsbabel -i xmap -f ${REFERENCE}/xmap -o an1 -F ${TMPDIR}/an1.out
 bincompare ${TMPDIR}/an1.out ${REFERENCE}/an1-out.ref
 
-rm -f ${TMPDIR}/an1.out
-gpsbabel -i google -f ${REFERENCE}/google.js -o an1 -F ${TMPDIR}/an1.out
-bincompare ${TMPDIR}/an1.out ${REFERENCE}/an1-line-out.ref
+#rm -f ${TMPDIR}/an1.out
+#gpsbabel -i gpx -f ${REFERENCE}/an1-in.gpx -o an1 -F ${TMPDIR}/an1.out
+#bincompare ${TMPDIR}/an1.out ${REFERENCE}/an1-line-out.ref
 

diff --git a/vecs.cc b/vecs.cc
index 4098ed8641c849734860eabc668a0f00fcc650e2..7fde64b3950cc577518b2e47c2949b066f29d9b7 100644 (file)
--- a/vecs.cc
+++ b/vecs.cc
@@ -44,7 +44,6 @@ extern ff_vecs_t compegps_vecs;
 extern ff_vecs_t copilot_vecs;
 extern ff_vecs_t coto_vecs;
 extern ff_vecs_t cst_vecs;
-extern ff_vecs_t delbin_vecs;
 extern ff_vecs_t dg100_vecs;
 extern ff_vecs_t dg200_vecs;
 extern ff_vecs_t easygps_vecs;
@@ -57,7 +56,6 @@ extern ff_vecs_t geoniche_vecs;
 extern ff_vecs_t geo_vecs;
 extern ff_vecs_t globalsat_sport_vecs;
 extern ff_vecs_t glogbook_vecs;
-extern ff_vecs_t google_vecs;
 extern ff_vecs_t google_dir_vecs;
 extern ff_vecs_t gpilots_vecs;
 extern ff_vecs_t gpl_vecs;
@@ -79,7 +77,6 @@ extern ff_vecs_t lowranceusr4_vecs;
 extern ff_vecs_t mag_fvecs;
 extern ff_vecs_t maggeo_vecs;
 extern ff_vecs_t magnav_vec;
-extern ff_vecs_t magpdb_vecs;
 extern ff_vecs_t mag_svecs;
 extern ff_vecs_t magX_fvecs;
 extern ff_vecs_t mapsend_vecs;
@@ -97,7 +94,6 @@ extern ff_vecs_t nmn4_vecs;
 extern ff_vecs_t ozi_vecs;
 extern ff_vecs_t palmdoc_vecs;
 extern ff_vecs_t pcx_vecs;
-extern ff_vecs_t ppdb_vecs;
 extern ff_vecs_t psit_vecs;             /* MRCB */
 extern ff_vecs_t quovadis_vecs;
 extern ff_vecs_t saroute_vecs;
@@ -522,13 +518,6 @@ vecs_t vec_list[] = {
     "vcf",
     NULL,
   },
-  {
-    &google_vecs,
-    "google",
-    "Google Maps XML",
-    "xml",
-    NULL,
-  },
   {
     &google_dir_vecs,
     "googledir",
@@ -990,13 +979,6 @@ vecs_t vec_list[] = {
     "ert",
     NULL,
   },
-  {
-    &delbin_vecs,
-    "delbin",
-    "DeLorme PN-20/PN-30/PN-40 USB protocol",
-    NULL,
-    NULL,
-  },
   {
     &skytraq_vecs,
     "skytraq",